From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 7 Aug 2019 00:28:40 +0000 (+0200)
Subject: environment: Remove transition tracking
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~839^2^2~43
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9073debe60c8da76c2a47b068a7cdb64f7567cc2;p=gnome-shell.git

environment: Remove transition tracking

The tracking was important in an earlier iteration, but as the helper
functions now remove overwritten transitions before setting up the
new ones, we can just as well connect to the ::stopped signal directly.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/668
---

diff --git a/js/ui/environment.js b/js/ui/environment.js
index a248ea069..f2944a5c1 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -58,20 +58,6 @@ function _patchLayoutClass(layoutClass, styleProps) {
     };
 }
 
-let _easingTransitions = new Map();
-
-function _trackTransition(transition, callback) {
-    if (_easingTransitions.has(transition))
-        transition.disconnect(_easingTransitions.get(transition));
-
-    let id = transition.connect('stopped', (t, isFinished) => {
-        _easingTransitions.delete(transition);
-        callback(isFinished);
-    });
-
-    _easingTransitions.set(transition, id);
-}
-
 function _makeEaseCallback(params) {
     let onComplete = params.onComplete;
     delete params.onComplete;
@@ -136,7 +122,7 @@ function _easeActor(actor, params) {
         let transition = actor.get_transition(animatedProps[0]);
 
         if (transition)
-            _trackTransition(transition, callback);
+            transition.connect('stopped', (t, finished) => callback(finished));
         else
             callback(true);
     }
@@ -180,7 +166,7 @@ function _easeActorProperty(actor, propName, target, params) {
     transition.set_to(target);
 
     if (callback)
-        _trackTransition(transition, callback);
+        transition.connect('stopped', (t, finished) => callback(finished));
 }
 
 function _loggingFunc(...args) {